gdk_x11_display_get_monitor: fix monitor number test logic
authorSébastien Villemot <sebastien@debian.org>
Mon, 9 Apr 2018 13:36:36 +0000 (15:36 +0200)
committerSébastien Villemot <sebastien@debian.org>
Mon, 9 Apr 2018 16:07:14 +0000 (18:07 +0200)
When asked for a nonexistent (positive) monitor number,
gdk_x11_display_get_monitor would (at best) return an uninitialized pointer,
instead of returning NULL.

gdk/x11/gdkdisplay-x11.c

index 1386acbb4996774f54cb3e3fa0f732ebf64e7329..15dd1a5a5fb4947f6854011f428be086094cbb4d 100644 (file)
@@ -2951,7 +2951,7 @@ gdk_x11_display_get_monitor (GdkDisplay *display,
 {
   GdkX11Display *x11_display = GDK_X11_DISPLAY (display);
 
-  if (0 <= monitor_num || monitor_num < x11_display->monitors->len)
+  if (0 <= monitor_num && monitor_num < x11_display->monitors->len)
     return (GdkMonitor *)x11_display->monitors->pdata[monitor_num];
 
   return NULL;